Remove DOM0_PHYSICAL_MEMORY_MAP dom0 op.

The addition of the e820 style memory_op sub calls make this operation
obsolete.

Signed-off-by: Ian Campbell <ian.campbell@xensource.com>

diff --git a/xen/arch/x86/dom0_ops.c b/xen/arch/x86/dom0_ops.c
index 91bcb38f4a75fb259bce9e4178ff974e9c06b428..a88e1889e90dbf46b09c91acdbcdbcd981c71f7b 100644 (file)
--- a/xen/arch/x86/dom0_ops.c
+++ b/xen/arch/x86/dom0_ops.c
@@ -404,27 +404,6 @@ long arch_do_dom0_op(struct dom0_op *op, XEN_GUEST_HANDLE(dom0_op_t) u_dom0_op)
     }
     break;
 
-    case DOM0_PHYSICAL_MEMORY_MAP:
-    {
-        struct dom0_memory_map_entry entry;
-        int i;
-
-        for ( i = 0; i < e820.nr_map; i++ )
-        {
-            if ( i >= op->u.physical_memory_map.max_map_entries )
-                break;
-            entry.start  = e820.map[i].addr;
-            entry.end    = e820.map[i].addr + e820.map[i].size;
-            entry.is_ram = (e820.map[i].type == E820_RAM);
-            (void)copy_to_guest_offset(
-                op->u.physical_memory_map.memory_map, i, &entry, 1);
-        }
-
-        op->u.physical_memory_map.nr_map_entries = i;
-        (void)copy_to_guest(u_dom0_op, op, 1);
-    }
-    break;
-
     case DOM0_HYPERCALL_INIT:
     {
         struct domain *d; 

diff --git a/xen/include/public/dom0_ops.h b/xen/include/public/dom0_ops.h
index 80f1e30affdb89b7d0a32abdc71d5c0463f600b8..4b321baff454314d98443b7e330503aade91bdfc 100644 (file)
--- a/xen/include/public/dom0_ops.h
+++ b/xen/include/public/dom0_ops.h
@@ -444,7 +444,7 @@ struct dom0_platform_quirk {
 typedef struct dom0_platform_quirk dom0_platform_quirk_t;
 DEFINE_XEN_GUEST_HANDLE(dom0_platform_quirk_t);
 
-#define DOM0_PHYSICAL_MEMORY_MAP 40
+#define DOM0_PHYSICAL_MEMORY_MAP 40   /* Unimplemented from 3.0.3 onwards */
 struct dom0_memory_map_entry {
     uint64_t start, end;
     uint32_t flags; /* reserved */